From 7e87360d27a4396d21c886c40666aaa9896e86ac Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 3 Sep 2020 08:43:55 +0100 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 481723 -> 482011 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index a738a54042a..8eb487cd956 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -321,6 +321,7 @@ export JAVAFLAGS=@JAVAFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ export JAVA_TARGET_VER=@JAVA_TARGET_VER@ diff --git a/configure.ac b/configure.ac index ea7e3c6899e354e664043046d21f6d34be690af7..291a5d1c06aae073475a4de3386fb3003001acba 100644 GIT binary patch delta 223 zcmdnJS@!l;*@hOz7N!>FEi9)wrx!J_h)gd~V-+$`@p24v^z;jH4GIWy1(FJx#R{dx znR)37B^jv-QK?1w3Sqvnnp~U;K#-ZHFkS8wi=sw)QEGvLZXsCS8l*Chi<1*%QoM&_ zaD0?&kbiubuWcpQbi*W8{mFAQMW$c4z#=&PfEhFU^bZ!SEYl5~m{_I%Z&<*_ zJ6S-8Z~9kGmSRaq=lI}Ir{E9`bi*cpRPvv$&&a~vet?Swh*^P{ZTkT(_TPR0)>1}h delta 60 zcmcb;Rd)Ag*@hOz7N!>FEi9)wr#C%fRi3`!IV1b@UtBE3(^++ygQhp|vv9RP;bsA1 ORv>2E{)C(TyB`46Ll)-% diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 363a8a41dea..bd05d4bba20 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -62,10 +62,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2